Fix up deprecated markup syntax. Add version numbers and a message on the

2008-06-20  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkbutton.c:
    * gtk/gtkcolorsel.c:
    * gtk/gtkentry.c:
    * gtk/gtkitemfactory.c:
    * gtk/gtknotebook.c:
    Fix up deprecated markup syntax. Add version numbers and
    a message on the remaning ones.

svn path=/trunk/; revision=20655

diff --git a/ChangeLog b/ChangeLog
index 6eb5fa128b3609772b08a915590da3b503a90916..60ae89bda176a9702d07a8c78e1710aeb1064ca4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-20  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkbutton.c:
+       * gtk/gtkcolorsel.c:
+       * gtk/gtkentry.c:
+       * gtk/gtkitemfactory.c:
+       * gtk/gtknotebook.c:
+       Fix up deprecated markup syntax. Add version numbers and
+       a message on the remaning ones.
+
 2008-06-20  Mikael Hallendal  <micke@imendio.com>
 
        * tests/testthreads.c: Use g_signal_connect instead of

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 576d84331253d5bcb8d39ddad525cb278a8a5c98..cc0304ddb7aa34cf7fb9c1295301506c35278d75 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -309,7 +309,7 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Emitted when the button is pressed.
    * 
-   * Deprecated: Use the #GtkWidget::button-press-event signal.
+   * Deprecated: 2.8: Use the #GtkWidget::button-press-event signal.
    */ 
   button_signals[PRESSED] =
     g_signal_new (I_("pressed"),
@@ -326,7 +326,7 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Emitted when the button is released.
    * 
-   * Deprecated: Use the #GtkWidget::button-release-event signal.
+   * Deprecated: 2.8: Use the #GtkWidget::button-release-event signal.
    */ 
   button_signals[RELEASED] =
     g_signal_new (I_("released"),
@@ -358,7 +358,7 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Emitted when the pointer enters the button.
    * 
-   * Deprecated: Use the #GtkWidget::enter-notify-event signal.
+   * Deprecated: 2.8: Use the #GtkWidget::enter-notify-event signal.
    */ 
   button_signals[ENTER] =
     g_signal_new (I_("enter"),
@@ -375,7 +375,7 @@ gtk_button_class_init (GtkButtonClass *klass)
    *
    * Emitted when the pointer leaves the button.
    * 
-   * Deprecated: Use the #GtkWidget::leave-notify-event signal.
+   * Deprecated: 2.8: Use the #GtkWidget::leave-notify-event signal.
    */ 
   button_signals[LEAVE] =
     g_signal_new (I_("leave"),

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index e1383f9c0fb6db49bf009a4fe2f2b1efcd90b6b9..7298d3f9142c022c0bba8da55fcbce64c29a4f48 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -2451,7 +2451,7 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
  * Sets the current color to be @color.  The first time this is called, it will
  * also set the original color to be @color too.
  *
- * Deprecated: Use gtk_color_selection_set_current_color() instead.
+ * Deprecated: 2.0: Use gtk_color_selection_set_current_color() instead.
  **/
 void
 gtk_color_selection_set_color (GtkColorSelection    *colorsel,
@@ -2826,7 +2826,7 @@ gtk_color_selection_palette_to_string (const GdkColor *colors,
  *
  * Return value: the previous change palette hook (that was replaced).
  *
- * Deprecated: This function is deprecated in favor of 
+ * Deprecated: 2.4: This function is deprecated in favor of 
  * gtk_color_selection_set_change_palette_with_screen_hook(), and does
  * not work in multihead environments.
  * 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 8fe531618dbe42962838694ee650a2cc82f00d6d..d826448ae071aed7ba132211329227254fe39e37 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4473,9 +4473,7 @@ gtk_entry_set_text (GtkEntry    *entry,
  *
  * Appends the given text to the contents of the widget.
  *
- * Deprecated: gtk_entry_append_text() is deprecated and should not
- *   be used in newly-written code. Use gtk_editable_insert_text()
- *   instead.
+ * Deprecated: 2.0: Use gtk_editable_insert_text() instead.
  */
 void
 gtk_entry_append_text (GtkEntry *entry,
@@ -4497,9 +4495,7 @@ gtk_entry_append_text (GtkEntry *entry,
  *
  * Prepends the given text to the contents of the widget.
  *
- * Deprecated: gtk_entry_prepend_text() is deprecated and should not
- *    be used in newly-written code. Use gtk_editable_insert_text()
- *    instead.
+ * Deprecated: 2.0: Use gtk_editable_insert_text() instead.
  */
 void
 gtk_entry_prepend_text (GtkEntry *entry,
@@ -4526,7 +4522,7 @@ gtk_entry_prepend_text (GtkEntry *entry,
  *
  * Sets the cursor position in an entry to the given value. 
  *
- * Deprecated: Use gtk_editable_set_position() instead.
+ * Deprecated: 2.0: Use gtk_editable_set_position() instead.
  */
 void
 gtk_entry_set_position (GtkEntry *entry,
@@ -4661,7 +4657,7 @@ gtk_entry_get_invisible_char (GtkEntry *entry)
  * Determines if the user can edit the text in the editable
  * widget or not. 
  *
- * Deprecated: Use gtk_editable_set_editable() instead.
+ * Deprecated: 2.0: Use gtk_editable_set_editable() instead.
  */
 void
 gtk_entry_set_editable (GtkEntry *entry,
@@ -4745,7 +4741,7 @@ gtk_entry_get_text (GtkEntry *entry)
  * selected will be those characters from @start_pos to the end of 
  * the text. 
  *
- * Deprecated: Use gtk_editable_select_region() instead.
+ * Deprecated: 2.0: Use gtk_editable_select_region() instead.
  */
 void       
 gtk_entry_select_region  (GtkEntry       *entry,

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 62a8dc897b8e09d39a1a4cdeb5bf23e45006b732..15a4bd3759c9856bb11bf5b6c02a88a4e8aae6ad 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -157,7 +157,7 @@ gtk_item_factory_init (GtkItemFactory           *ifactory)
  *
  * Beware that the returned object does not have a floating reference.
  *
- * Deprecated: 2.4:    
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkItemFactory*
 gtk_item_factory_new (GType         container_type,
@@ -374,7 +374,7 @@ gtk_item_factory_add_item (GtkItemFactory           *ifactory,
  * 
  * Initializes an item factory.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */  
 void
 gtk_item_factory_construct (GtkItemFactory     *ifactory,
@@ -429,7 +429,7 @@ gtk_item_factory_construct (GtkItemFactory  *ifactory,
  * <literal>"&lt;name&gt;"</literal> prefix of @path as the @path argument 
  * for gtk_item_factory_new().
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkItemFactory*
 gtk_item_factory_from_path (const gchar      *path)
@@ -525,7 +525,7 @@ gtk_item_factory_finalize (GObject *object)
  *
  * Obtains the item factory from which a widget was created.
  *
- * Deprecated: 2.4
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkItemFactory*
 gtk_item_factory_from_widget (GtkWidget               *widget)
@@ -558,7 +558,7 @@ gtk_item_factory_from_widget (GtkWidget            *widget)
  * path specified in gtk_item_factory_new() with the path specified in the 
  * #GtkItemFactoryEntry from which the widget was created.)
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 G_CONST_RETURN gchar*
 gtk_item_factory_path_from_widget (GtkWidget       *widget)
@@ -589,7 +589,7 @@ gtk_item_factory_path_from_widget (GtkWidget            *widget)
  *
  * Creates the menu items from the @entries.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_create_items (GtkItemFactory     *ifactory,
@@ -611,7 +611,7 @@ gtk_item_factory_create_items (GtkItemFactory          *ifactory,
  *
  * Creates the menu items from the @entries.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_create_items_ac (GtkItemFactory      *ifactory,
@@ -647,7 +647,7 @@ gtk_item_factory_create_items_ac (GtkItemFactory      *ifactory,
  * submenu, then the submenu is returned. If you are interested in the menu 
  * item, use gtk_item_factory_get_item() instead.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkWidget*
 gtk_item_factory_get_widget (GtkItemFactory *ifactory,
@@ -700,7 +700,7 @@ gtk_item_factory_get_widget (GtkItemFactory *ifactory,
  * If there are multiple items with the same action, the result is 
  * undefined.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkWidget*
 gtk_item_factory_get_widget_by_action (GtkItemFactory *ifactory,
@@ -737,7 +737,7 @@ gtk_item_factory_get_widget_by_action (GtkItemFactory *ifactory,
  * submenu, then the item is returned. If you are interested in the submenu, 
  * use gtk_item_factory_get_widget() instead.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkWidget*
 gtk_item_factory_get_item (GtkItemFactory *ifactory,
@@ -768,7 +768,7 @@ gtk_item_factory_get_item (GtkItemFactory *ifactory,
  * Obtains the menu item which was constructed from the first 
  * #GtkItemFactoryEntry with the given @action.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 GtkWidget*
 gtk_item_factory_get_item_by_action (GtkItemFactory *ifactory,
@@ -906,7 +906,7 @@ gtk_item_factory_parse_path (GtkItemFactory *ifactory,
  *
  * Creates an item for @entry.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_create_item (GtkItemFactory        *ifactory,
@@ -1140,7 +1140,7 @@ gtk_item_factory_create_item (GtkItemFactory           *ifactory,
  *
  * Creates the menu items from the @entries.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_create_menu_entries (guint              n_entries,
@@ -1226,7 +1226,7 @@ gtk_item_factory_create_menu_entries (guint              n_entries,
  * 
  * Deletes all widgets constructed from the specified path.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factories_path_delete (const gchar *ifactory_path,
@@ -1287,7 +1287,7 @@ gtk_item_factories_path_delete (const gchar *ifactory_path,
  * Deletes the menu item which was created for @path by the given
  * item factory.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_delete_item (GtkItemFactory         *ifactory,
@@ -1317,7 +1317,7 @@ gtk_item_factory_delete_item (GtkItemFactory         *ifactory,
  * Deletes the menu item which was created from @entry by the given
  * item factory.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_delete_entry (GtkItemFactory         *ifactory,
@@ -1352,7 +1352,7 @@ gtk_item_factory_delete_entry (GtkItemFactory         *ifactory,
  * Deletes the menu items which were created from the @entries by the given
  * item factory.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_delete_entries (GtkItemFactory         *ifactory,
@@ -1399,7 +1399,7 @@ gtk_item_factory_menu_pos (GtkMenu  *menu,
  * gtk_item_factory_popup_with_data(). This data is available until the menu
  * is popped down again.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 gpointer
 gtk_item_factory_popup_data_from_widget (GtkWidget *widget)
@@ -1424,7 +1424,7 @@ gtk_item_factory_popup_data_from_widget (GtkWidget *widget)
  * gtk_item_factory_popup_with_data(). This data is available until the menu
  * is popped down again.
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 gpointer
 gtk_item_factory_popup_data (GtkItemFactory *ifactory)
@@ -1466,7 +1466,7 @@ ifactory_delete_popup_data (GtkObject        *object,
  * The operation of the @mouse_button and the @time_ parameter is the same
  * as the @button and @activation_time parameters for gtk_menu_popup().
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_popup (GtkItemFactory         *ifactory,
@@ -1505,7 +1505,7 @@ gtk_item_factory_popup (GtkItemFactory            *ifactory,
  * The operation of the @mouse_button and the @time_ parameters is the same
  * as the @button and @activation_time parameters for gtk_menu_popup().
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */
 void
 gtk_item_factory_popup_with_data (GtkItemFactory       *ifactory,
@@ -1564,7 +1564,7 @@ gtk_item_factory_popup_with_data (GtkItemFactory  *ifactory,
  * Sets a function to be used for translating the path elements before they
  * are displayed. 
  *
- * Deprecated: 2.4:
+ * Deprecated: 2.4: Use #GtkUIManager instead.
  */ 
 void
 gtk_item_factory_set_translate_func (GtkItemFactory      *ifactory,

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 1ad9439657c015ea50b0bdf34b20ff78863128c4..f98249e24c469335f85e6d192203f1a0d21cf1ae 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7339,7 +7339,7 @@ gtk_notebook_set_window_creation_hook (GtkNotebookWindowCreationFunc  func,
  * not be able to exchange tabs with any other notebook.
  * 
  * Since: 2.10
- * Deprecated:2.12: use gtk_notebook_set_group() instead.
+ * Deprecated: 2.12: use gtk_notebook_set_group() instead.
  */
 void
 gtk_notebook_set_group_id (GtkNotebook *notebook,
@@ -7393,7 +7393,7 @@ gtk_notebook_set_group (GtkNotebook *notebook,
  * Return Value: the group identificator, or -1 if none is set.
  *
  * Since: 2.10
- * Deprecated:2.12: use gtk_notebook_get_group() instead.
+ * Deprecated: 2.12: use gtk_notebook_get_group() instead.
  */
 gint
 gtk_notebook_get_group_id (GtkNotebook *notebook)